Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: keep status as In Progress for RIV for Timeout Error (backport #42274) #42504

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2024

System change the status to Failed for the Repost Item Valuation record, if the Reposting failed because of the timeout error


This is an automatic backport of pull request #42274 done by [Mergify](https://mergify.com).

(cherry picked from commit 10280d6)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@mergify mergify bot added the conflicts label Jul 28, 2024
@mergify mergify bot requested a review from rohitwaghchaure as a code owner July 28, 2024 17:56
Copy link
Contributor Author

mergify bot commented Jul 28, 2024

Cherry-pick of 10280d6 has failed:

On branch mergify/bp/version-14-hotfix/pr-42274
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 10280d6140.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from s-aga-r as a code owner July 28, 2024 17:56
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jul 28, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Jul 29, 2024
@rohitwaghchaure rohitwaghchaure merged commit 8e8d0c7 into version-14-hotfix Jul 30, 2024
9 of 10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-42274 branch July 30, 2024 08:55
frappe-pr-bot pushed a commit that referenced this pull request Jul 31, 2024
## [14.70.13](v14.70.12...v14.70.13) (2024-07-31)

### Bug Fixes

* builtins.KeyError: ('ABC', 'Store - CP') (backport [#42505](#42505)) ([#42508](#42508)) ([0256c64](0256c64))
* consider payment entries for checking if tds is deducted ([e7432fc](e7432fc))
* dynamic condition in the pricing rule not working (backport [#42467](#42467)) ([#42543](#42543)) ([53034c3](53034c3))
* **gross profit:** incorrect valuation rate on different warehouses ([1a7efbb](1a7efbb))
* ignore duplicates while creating default templates ([99bc8e8](99bc8e8))
* incorrect cost_center on AR/AP report ([0e2abbd](0e2abbd))
* keep status as In Progress for RIV for Timeout Error (backport [#42274](#42274)) ([#42504](#42504)) ([8e8d0c7](8e8d0c7))
* parenttype in item wise purchase and sales register ([97f2e88](97f2e88))
* performance issue for the report Purchase Order Analysis report (backport [#42503](#42503)) ([#42506](#42506)) ([f42f1bb](f42f1bb))
* price_list_currency not found error (backport [#42534](#42534)) ([#42538](#42538)) ([3ba6f40](3ba6f40))
* warehouse filter in Product Bundle Balance (backport [#42532](#42532)) ([#42536](#42536)) ([0441984](0441984))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.70.13 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants